From: Steven Hand <steven@xensource.com>
Date: Thu, 5 Apr 2007 07:24:56 +0000 (+0100)
Subject: Fix hvm balloon driver; missed this hunk in last checkin.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15264^2~23
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22man:///%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22man:/?a=commitdiff_plain;h=1b46e1faf30d916b2e01ab1678e49309d6fb9eb2;p=xen.git

Fix hvm balloon driver; missed this hunk in last checkin.

Signed-off-by: Steven Hand <steven@xensource.com>
---

diff --git a/linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c b/linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c
index 195f06921a..4978ea58dc 100644
--- a/linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c
+++ b/linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c
@@ -276,9 +276,11 @@ static int decrease_reservation(unsigned long nr_pages)
 		if (!PageHighMem(page)) {
 			v = phys_to_virt(pfn << PAGE_SHIFT);
 			scrub_pages(v, 1);
+#ifdef CONFIG_XEN
 			ret = HYPERVISOR_update_va_mapping(
 				(unsigned long)v, __pte_ma(0), 0);
 			BUG_ON(ret);
+#endif
 		}
 #ifdef CONFIG_XEN_SCRUB_PAGES
 		else {